From 760285e1805c8ad4cdcb410dda6c9cdb5eb2c90b Mon Sep 17 00:00:00 2001 From: Bernd Zeimetz Date: Thu, 6 May 2010 00:29:04 +0200 Subject: [PATCH] Do not build gpsbabel.pdf on mips as fop is broken there. --- debian/control | 2 +- ...abel.doc-base => gpsbabel.doc-base.common} | 4 +--- debian/gpsbabel.doc-base.pdf | 3 +++ debian/gpsbabel.docs | 1 - debian/rules | 23 +++++++++++++------ 5 files changed, 21 insertions(+), 12 deletions(-) rename debian/{gpsbabel.doc-base => gpsbabel.doc-base.common} (77%) create mode 100644 debian/gpsbabel.doc-base.pdf diff --git a/debian/control b/debian/control index c46458acb..efc910f4a 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Bernd Zeimetz Build-Depends: debhelper (>= 7.0.0), quilt, autotools-dev, autoconf, libexpat1-dev, expat, help2man, - fop, + fop [!mips], xsltproc, docbook-xml, docbook-xsl, libxml2-utils, libusb-dev, zlib1g-dev, libpaper-dev, libqt4-dev Standards-Version: 3.8.4 diff --git a/debian/gpsbabel.doc-base b/debian/gpsbabel.doc-base.common similarity index 77% rename from debian/gpsbabel.doc-base rename to debian/gpsbabel.doc-base.common index f3bc6f450..9a5224ad8 100644 --- a/debian/gpsbabel.doc-base +++ b/debian/gpsbabel.doc-base.common @@ -2,9 +2,7 @@ Document: gpsbabel Title: gpsbabel filter and format documentation Section: Science/Geoscience -Format: PDF -Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz - Format: HTML Index: /usr/share/doc/gpsbabel/htmldoc/index.html Files: /usr/share/doc/gpsbabel/htmldoc/*.html + diff --git a/debian/gpsbabel.doc-base.pdf b/debian/gpsbabel.doc-base.pdf new file mode 100644 index 000000000..c2544cd4f --- /dev/null +++ b/debian/gpsbabel.doc-base.pdf @@ -0,0 +1,3 @@ +Format: PDF +Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz + diff --git a/debian/gpsbabel.docs b/debian/gpsbabel.docs index a1bdee4b5..e2de8ee8e 100644 --- a/debian/gpsbabel.docs +++ b/debian/gpsbabel.docs @@ -1,4 +1,3 @@ README.* debian/doctmp/* AUTHORS -gpsbabel.pdf diff --git a/debian/rules b/debian/rules index 056816aba..ae095a787 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,9 @@ PKG_GPSBABEL=gpsbabel PKG_GPSBABEL_GUI=gpsbabel-gui +DOCTEMP = debian/doctmp VERSION := $(shell dpkg-parsechangelog | awk '/^Version/ {print $$2}') +HOSTARCH := $(strip $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)) #we use quilt to handle our patches include /usr/share/quilt/quilt.make @@ -21,7 +23,7 @@ endif # Extended precision on i386 results in weird bugs, so we build # with -ffloat-store. -ifeq (i386,$(strip $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU))) +ifeq (i386,$(HOSTARCH)) CFLAGS += -ffloat-store endif @@ -32,13 +34,13 @@ CONFENV = LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" configure: configure-stamp gui/Makefile configure-stamp: $(QUILT_STAMPFN) dh_testdir -ifneq "$(wildcard /usr/share/misc/config.sub)" "" +ifneq (,$(wildcard /usr/share/misc/config.sub)) cp -f /usr/share/misc/config.sub config.sub endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" +ifneq (,$(wildcard /usr/share/misc/config.guess)) cp -f /usr/share/misc/config.guess config.guess endif - $(CONFENV) ./configure --with-zlib=system --with-doc=debian/doctmp \ + $(CONFENV) ./configure --with-zlib=system --with-doc=$(DOCTEMP) \ --prefix=/usr touch $@ @@ -73,7 +75,14 @@ build-stamp: configure-stamp touch $@ build-doc-stamp: configure-stamp - $(MAKE) doc + $(MAKE) $(DOCTEMP)/htmldoc-devel/index.html WEB=$(DOCTEMP) DOCVERSION=devel + cp $(CURDIR)/debian/gpsbabel.doc-base.common $(CURDIR)/debian/gpsbabel.doc-base +ifneq (mips,$(HOSTARCH)) + $(MAKE) gpsbabel.pdf WEB=$(DOCTEMP) DOCVERSION=devel + rm -f $(CURDIR)/$(DOCTEMP)/htmldoc-devel/gpsbabel-$(DOCVERSION).pdf DOCVERSION=devel + cp gpsbabel.pdf $(CURDIR)/$(DOCTEMP) + cat $(CURDIR)/debian/gpsbabel.doc-base.pdf >> $(CURDIR)/debian/gpsbabel.doc-base +endif touch $@ build-gui: build-gui-stamp @@ -106,6 +115,7 @@ clean-patched: xmldoc/filters/options/track-trk2seg.xml \ xmldoc/filters/options/track-seg2trk.xml rm -f gbversion.h + rm -f $(CURDIR)/debian/gpsbabel.doc-base dh_clean install: $(BUILD_TARGETS) @@ -117,9 +127,8 @@ install: $(BUILD_TARGETS) # Add here commands to install the package into debian/gpsbabel. $(MAKE) install DESTDIR=$(CURDIR)/debian/gpsbabel - # Rename htmldoc dir and remove pdf file + # Rename htmldoc dir mv `ls -d $(CURDIR)/debian/doctmp/htmldoc-*` $(CURDIR)/debian/doctmp/htmldoc - rm -f $(CURDIR)/debian/doctmp/htmldoc/*.pdf dh_install -- 2.30.2